Merge fix for Bug#4238 from trunk
authorChong Yidong <cyd@stupidchicken.com>
Fri, 22 Jul 2011 15:23:43 +0000 (11:23 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Fri, 22 Jul 2011 15:23:43 +0000 (11:23 -0400)

Trivial merge